Revert "gsk: Add font options to the glyph cache"

This reverts commit 6599cb001fa184ed224c655519d659f168e9face.

diff --git a/gsk/ngl/gsknglglyphlibrary.c b/gsk/ngl/gsknglglyphlibrary.c
index fdfa1abe3021baa28fab4647e75e305b038362ef..9f269d8643d5aac4a8bd318f55d6ef9ae5a96bb7 100644 (file)
--- a/gsk/ngl/gsknglglyphlibrary.c
+++ b/gsk/ngl/gsknglglyphlibrary.c
@@ -166,19 +166,11 @@ render_glyph (cairo_surface_t           *surface,
 {
   cairo_t *cr;
   cairo_glyph_t glyph;
-  cairo_font_options_t *options;
 
   g_assert (surface != NULL);
   g_assert (scaled_font != NULL);
 
   cr = cairo_create (surface);
-  options = cairo_font_options_create ();
-  cairo_font_options_set_hint_metrics (options, key->hint_metrics ? CAIRO_HINT_METRICS_ON : CAIRO_HINT_METRICS_OFF);
-  cairo_font_options_set_antialias (options, key->antialias ? CAIRO_ANTIALIAS_GRAY : CAIRO_ANTIALIAS_NONE);
-  cairo_font_options_set_hint_style (options, key->hint_style);
-  cairo_set_font_options (cr, options);
-  cairo_font_options_destroy (options);
-
   cairo_set_scaled_font (cr, scaled_font);
   cairo_set_source_rgba (cr, 1, 1, 1, 1);
 

diff --git a/gsk/ngl/gsknglglyphlibraryprivate.h b/gsk/ngl/gsknglglyphlibraryprivate.h
index 6d9e81060e8ee27a52f4c5ff4d6fed27d6ec8e78..a9f099c0b5dface8ac2d310649b551f97657d73e 100644 (file)
--- a/gsk/ngl/gsknglglyphlibraryprivate.h
+++ b/gsk/ngl/gsknglglyphlibraryprivate.h
@@ -35,10 +35,7 @@ typedef struct _GskNglGlyphKey
   PangoGlyph glyph;
   guint xshift : 2;
   guint yshift : 2;
-  guint hint_metrics : 1;
-  guint antialias : 1;
-  guint hint_style : 3;
-  guint scale  : 23; /* times 1024 */
+  guint scale  : 28; /* times 1024 */
 } GskNglGlyphKey;
 
 typedef struct _GskNglGlyphValue